Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Fri, 5 May 2006 17:36:26 +0000 (18:36 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Fri, 5 May 2006 17:36:26 +0000 (18:36 +0100)

Trivial merge